ref: 166e2bca936409c8ec78867bc0fc04eeba418e6e
parent: df05cd8e0e71b4e48e88f12c779484e1abac45c1
parent: eaf851e095ca15c11b26d2aa7c2589617939d2db
author: Simon Howard <fraggle@soulsphere.org>
date: Sat Jan 14 16:55:08 EST 2017
Merge remote-tracking branch 'origin/master' into sdl2-branch