Merge tag 'v1.0.2' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Dec 2015 22:04:20 +0000 (17:04 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Dec 2015 22:04:20 +0000 (17:04 -0500)
1.0.2


Trivial merge