v3.6.1
Merge branch 'release/3.6.1' into production
Merge tag 'v3.6.1'

3.6.1

 * Remove underscore (Ryan Graham)