Merge branch 'jamvideosolutions/master'

(Marker merge -- cherry-picked the size format; the align one is
superseded and the gtest ones collide with gtest's upstream
recommendations [only Gentoo has gtest as a package].)
This commit is contained in:
David Lamparter 2017-05-19 19:27:34 +02:00
commit 5cbd52ef74

Diff content is not available