+ dev
+ master
Merge branch 'dev'

mit message to explain why this merge is necessary,