Version 2.1.7, which is a pile of little tweaks and additional functionality
Merge branch 'master' into qmake-port