convert to junit4
Merge branch '1.12'
Merge branch 'master' into pull-requests