Linux fixes.
Merge branch 'dev' of github.com:dennisferron/Common-Dependencies into dev