Merge tag 'v1.3.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 21:15:43 +0000 (16:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 21:15:43 +0000 (16:15 -0500)
Version 1.3.12


Trivial merge