[W47] John Hu: 11/17 - 11/21
Merge pull request #53 from huchengtw-moz/2014-11-24

[W47] John Hu: 11/17 - 11/21