v3.3.0
16dbdbd7 · Merge branch 'master' into v3.3.0 · Oct 29, 2014