Latest unstable
Merge pull request #796 from khawkins/unstable

Latest unstable