3.17.1-pre package and bower bumps.
Merge branch 'dev-master' into dev-3.x
3.18.0-pre package and bower bumps.