Merge branch 'patch'
Version 3.0.1 (2014-07-16)