Update from upstream
Update from upstream
Merge branch 'master' into hawaii

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
Require Qt >= 5.1