ref: e1188317dbd09738abdcd41e585a6d1a7ac1f79a
parent: 93f58bbef5f4c941f32edbb6285d4650d6456c5d
parent: ca78a3ab8f72957395611729b3a5df0500622633
author: Simon Howard <fraggle@soulsphere.org>
date: Fri Jan 1 16:25:55 EST 2016
Merge branch 'master' into sdl2-branch