2.1 branch status
Merge pull request #583 from stevelacey/patch-1

2.1 branch status