Merge pull request #1 from yukiyan/master

2014.10.10 production deployment by yukiyan_w