Merge tag 'v1.5.18' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Apr 2016 20:49:45 +0000 (16:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Apr 2016 20:49:45 +0000 (16:49 -0400)
Version 1.p5.18


Trivial merge