Merge branch 'patch'
Merge branch 'major'
Version 4.0.0 (2014-10-26)