Opt-in: solved issue with XMLRPC urls (that disappeared at merge)
Merge branch 'expedient.refactor.merge' of github.com:fp7-ofelia/ocf into expedient.refactor.merge