Merge branch 'patch'
Version 19.6.1 (2014-03-04)