Merge branch 'master' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Feb 2017 16:34:54 +0000 (11:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Feb 2017 16:34:54 +0000 (11:34 -0500)

Trivial merge