Update from upstream
Ignore QtCreator project file
Merge branch 'master' into hawaii