Merge branch 'patch'
Version 19.5.1 (2013-12-02)