cleaning up merge mess
Merge branch 'master' into testing