Next 20x v3

@ken-tilera, do those tile changes look ok to you? Need my tile buildbot slave to be green for the master-2.0.x branch :)