New in 3.3.1 * Merge changes from 3.1.x branch * Fix some bugs with computing widths during layout