Merge pull request #1337 from RyanMelenaNoesis/master