Merge pull request #729 from khawkins/unstable

Merging master to unstable