ref: ca6424121b6db33b7ce6e6d8671f9fa32b22e4cc
parent: 8a52bc045b2adb3b40d1c7b65522dfc6c9379130
parent: cb793641ca3b7d549a4e84ecec0b822357dded67
author: Fabian Greffrath <fabian@greffrath.com>
date: Wed Aug 23 04:44:21 EDT 2017
Merge branch 'master' into sdl2-branch