Staged for 0.3.1 release