v4.1.5(WD)201408201305
Merge remote-tracking branch 'doyoe/master'
Merge branch 'master' into gh-pages