Bring in tab changes from 3.1 (See 7e38020)

Closes #539