Merge "P is for PAINT." into pi-dev