1.0.7 version preps
back to 1.0.8-dev
merge 080bac7c5f9e9a307a81fe97279c73d03a13f66b to 971c9485fa3fd0b921515dc49ac2efb0b45e80ee (from 1.0)