Merge branch 'master' into jangaroo-3