Updating feature
Merge with flag '--no-ff' branch 'dev' of github.com:sawtell/playground into dev
Merge branch 'dev' into feature-x