Pull request reviewed by @alex and approved this morning.