Set VERSION to 3.3.0-dev (via xsrc)
updated licesens to 2014
Merge branch 'master' into 3.2.x
Set VERSION to 3.2.0-rc4 (via xsrc)