Merge pull request #1586 from computersalat/master