Remove *.pro.user* file
Merge remote-tracking branch 'origin/testing' into testing