Merge remote-tracking branch 'origin/feature-20140730-is-composing' into 20140401-dev-stable