Temporarily removed global -Werror flag
Merge remote-tracking branch 'upstream/master' into version-1.2