Merge branch 'patch'
Version 2.0.3 (2014-01-16)