Expedient: solving circular dependency
Merge branch 'ofelia.development' of https://github.com/fp7-ofelia/ocf into ofelia.development