oops, need this for smnnepo tests, put it back
Merge remote-tracking branch 'origin/master' into pjsm/2.0