R1:4acf45743155

Merge remote branch 'cadamo/devel'

Conflicts:
src/__celerity_resource_map__.php