40.11 layout, osx fix
Merge pull request #166 from fricy/DF2014

40.11 layout, osx fix