Updated for new snarl.
Merge branch 'test' into dev