Merge pull request #718 from khawkins/unstable

Latest unstable