1.6 for 1.7

Include #315 (#313) in 1.7.