Branch 0.4 m5 complete, ready to merge to master.