Fix wrong register bit name
Merge branch 'develop' into feature/season2014