For some reason compiler does not likes $this
Merge branch 'master' into gquery_1_4_release