Check in 1.3.2
Check in 1.3.3
Check in 1.4.0
Check in 1.4.1
Check in 1.4.2
Merge from upstream, fork specifics removed as they are now redundant