manual merge of ignore files
remove xmlrpc
Merge branch 'master' into dev

* master:
Merge branch 'dev'