submitted for publishing on 2/13/13
Merge pull request #974 from WalterHub/mymaster

submitted for publishing on 2/13/13