Final Commit for 1.4.0

Please see the changelog