Version 2.1.7, which is a pile of little tweaks and additional functionality
Merge remote-tracking branch 'upstream/master'