Merge branch 'release/1.0.2' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Oct 2015 18:10:11 +0000 (14:10 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Oct 2015 18:10:11 +0000 (14:10 -0400)

Trivial merge