Merge tag 'v1.3.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jan 2016 18:26:46 +0000 (13:26 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jan 2016 18:26:46 +0000 (13:26 -0500)
Version 1.3.1


Trivial merge