Bring in changes from 0.7.5