Reverted back to 2.1.5 changes, oops..
Merge branch 'master' into 2.2