[W48][W49] John Hu: 12/01 - 12/05
Merge pull request #54 from huchengtw-moz/2014-12-09

[W48][W49] John Hu: 12/01 - 12/05