Bump to next parent version
Merge branch 'master' into tourapp