Merged in default (pull request #95)

Updates for the 2.14.0 release

Approved-by: Elliott Sales de Andrade
Approved-by: Robbie
Approved-by: John Bailey