Merge tag 'v1.1.17' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:34:57 +0000 (14:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:34:57 +0000 (14:34 -0400)
Version 1.1.17


Trivial merge