Merge branch '0.3.x' immediately after the 0.3.1 release