- fix for #472
Merge branch 'rockytv' into pre-v0.1.5