'feature-20140730-is-composing' merged into '20140401-dev-stable' branch in 'op' submodule