Upgrade to 2.3.1 from official upstream.

Overrides thomas-mcdonald/bootstrap-sass#307, thomas-mcdonald/bootstrap-sass#306
Merge pull request #311 from trisweb/trisweb_2.3.1

Upgrade to 2.3.1 from official upstream.