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:
commit
5cbd52ef74