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