Auto stash before merge of "master" and "origin/master"

Created by: agruzinov

Dear Olof,

I've in process of updating the edna installation from local repo and need to add this beforehand to ignore as Mac-specific files.

Shall I do PR to the master branch directly?

Thanks and cheers!