Use correct config name for bithdtv
Merge branch 'refs/heads/develop'