Merge branch 'master' into develop
Add the CHANGELOG to the XPI file
Version 1.0-RC6