Merge branch 'other'
Merge branch 'minor'
Version 2.1.0 (2014-05-04)