v1.3.3-pre

DO NOT MERGE YET.

This will be merged to master once 1.3.2 has been released.