Fish will now give (albeit shaky) instructions...
Merge branch 'master' into develop