0.9.4 r3 commit, copied from master