PR: 19877 Submitted by: Eoin Lawless <eoin@maths.tcd.ie>
Submitted by: Ade Lovett <ade@lovett.com>
PR: 11341 Submitted by: Oscar Bonilla <obonilla@fisicc-ufm.edu>