Merge tag 'v1.5.20' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Apr 2016 14:30:14 +0000 (10:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Apr 2016 14:30:14 +0000 (10:30 -0400)
Version 1.5.20


Trivial merge