updates for 76
Merge branch 'dev'