Merge branch 'stv0g-master'