Update other.xml, options.xml
Merge branch 'master'