Merge branch 'hotfix/1.1.13' v1.1.13
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 15:54:35 +0000 (10:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 15:54:35 +0000 (10:54 -0500)

Trivial merge