Merging 1.3.1 changes to master

* Don't clean, incase we aren't able to build.

/cc @cmeiklejohn