Merge pull request #1005 from rustyswayne/1.5.2

#M-537 Fixed