Merge branch 'hotfix/1.1.20' v1.1.20
authorIan Weller <ian@gaslightmedia.com>
Wed, 17 Aug 2016 17:21:41 +0000 (13:21 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 17 Aug 2016 17:21:41 +0000 (13:21 -0400)
commita7c0ae6fb8223cc41df94325dc02d7f65acf9e40
treecbc4426dcf5e389cb04c23574552f95373c8696c
parent7987c58c1fdffcb034499a07c8941a1bd1cd3c72
parentb3e692b494c7a72e3237d1db88fe579bc220fe0b
Merge branch 'hotfix/1.1.20'