Built richardwestenra from commit cfcf3a1 on branch master