Merge the lp-surface-tiling branch into master.