Merge branch 'major'
Version 3.0.0 (2014-06-22)