Solving add aggregates bug with wrong patch
Merge branch 'expedient.refactor' of github.com:fp7-ofelia/ocf into expedient.refactor