Updated .scale() mixin so that it accepts optional vertical scale factor parameter.
reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)

fixes issue twbs/bootstrap#11728
Remove incompatible properties.
Merge branch 'master' into pr/11750

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
Merge pull request #11748 from bganicky/patch-1

Updated .scale() mixin so that it accepts optional vertical scale factor...
add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs
Merge branch 'master' into pr/11744

Conflicts:
	dist/css/bootstrap.min.css
Fixes #11741: Don't set headings font-family again, just use inherit
fix validation failure