Merge pull request #929 from edbprx/master