Merge tag 'v1.1.20' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 17 Aug 2016 17:22:04 +0000 (13:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 17 Aug 2016 17:22:04 +0000 (13:22 -0400)
version 1.1.20


Trivial merge