Prepare for release 2.1.1.
Fix white-space.
Merge branch 'release/2.1.1' into develop