Merge branch 'stable-0.1-hd' into stable-0.1