Merge remote-tracking branch 'origin/dev'
setup for next development release