Fix missing ^, causing parse error. Fixes #2154
Merge branch 'master' into 2_0_0