'Dev' branch stuff.

Merges #785