Merge tag 'v1.5.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 15:54:37 +0000 (11:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 15:54:37 +0000 (11:54 -0400)
Version 1.5.12


Trivial merge