Merge pull request #718 from rustyswayne/1.3.0

#M-298 {In Testing}