Merge branch 'patch'
Version 2.0.4 (2014-04-26)