refactor version-specific code such that newest is default
Merge remote-tracking branch 'upstream/master'