Built richardwestenra from commit fb72e7d on branch dev