Merging in changes from 0.11.8