Merge pull request #183 from askeing/v2.0

Merge remote-tracking branch 'mozilla/master' into v2.0