Merge branch 'release/v3.1.7' into develop
Updated versions.json
Update bootstrap-sass submodule to v3.2.0+2
Upgrade to bootstrap-sass v3.2.0+2
Merge branch 'release/v3.2.0_1'