Merge branch 'master' into 1.4

Conflicts:
	common.pri
This commit is contained in:
Arin Alex 2016-12-07 20:41:04 +03:00
commit 00b30be295

Diff Content Not Available