Merge pull request #316 from gavincornwell/1.4-dev

Sync 1.4-dev branch with master (changes for 1.3.2)