Make testing of deprecated API optional
Merge branch 'master' into r-0.3
Set release version to 0.3.3