#M-302 Fixed
Merge pull request #735 from rustyswayne/1.3.0

#M-302 Fixed