Merge branch 'master' into 1.4
Bump to 1.4.0.5
Merge remote-tracking branch 'origin/1.4' into pt29-2i-pagination
Merge branch 'master' into 1.4
Merge branch 'master' into 1.4
Bumping to 1.4.0.6