Macro if-python2 for compile-time choice between Python 2 and Python 3 code branches
Merge branch 'master' into pr/287