Ignore a couple of directories in my dev tree
Merge branch 'master' into devel