Merge pull request #328 from gavincornwell/master

Integrate 1.4-dev branch into master