Merge pull request #1292 from engelant/master