Merge in changes from mutewinter repo
Merge in useful changes from mutewinter repo