Built richardwestenra from commit 8a2dc41 on branch dev