Merge branch 'patch'
Version 19.8.2 (2014-07-01)