Merge branch 'develop' into feature/steve
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Feb 2016 14:57:15 +0000 (09:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Feb 2016 14:57:15 +0000 (09:57 -0500)

Trivial merge