Merge from Brad upstream

Includes latest v0.7.8 release