Merge pull request #942 from rustyswayne/1.5.0

#M-459 Fixed
Lang updates