1.0.7 version preps
back to 1.0.8-dev
merge d043a56e4c506833590e57760f0fdaede54fd5a9...210e9efc244f268ed9556434e2d00b045f5eb9c9 (from 1.0)