Merge branch 'release-20131106'
Merge branch 'release-20140225'
Merge branch 'release-20140616'
Installation instructon for Mac OS X
Merge
Merge branch 'master' into develop