Merge pull request #2661 from nwmcsween/nwmcsween
authorDaniel Mack <github@zonque.org>
Fri, 19 Feb 2016 11:29:23 +0000 (12:29 +0100)
committerDaniel Mack <github@zonque.org>
Fri, 19 Feb 2016 11:29:23 +0000 (12:29 +0100)
Include and internal struct member fixes.


Trivial merge