Merge tag 'v1.2.20' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:41:39 +0000 (13:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:41:39 +0000 (13:41 -0400)
version 1.2.20


Trivial merge