Merge branch 'master' into inline_editing
Merge branch 'inline_editing' of github.com:homeserve-alliance/comfortable-mexican-sofa into inline_editing