Merge branch 'other'
Merge branch 'major'
Version 20.0.0 (2014-10-26)