https fix
Merge branch 'master' into gh-pages
build/deploy on Wed Oct 22 2014 14:15:31 GMT+0800 (HKT)