Merge remote-tracking branch 'upstream/master' into feature/jassimp-classloader-license
authorJesper Smith <jsmith@ihmc.us>
Mon, 16 Oct 2017 17:43:35 +0000 (12:43 -0500)
committerJesper Smith <jsmith@ihmc.us>
Mon, 16 Oct 2017 17:43:35 +0000 (12:43 -0500)

Trivial merge