Merge branch 'hotfix/1.0.27'
authorIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 20:38:54 +0000 (16:38 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 20:38:54 +0000 (16:38 -0400)
commitadd43e2d3bc3ae6c94d6408097ab3542af850b98
tree7297f5ea27b38c59c3f1f5e7e45500dd54d4625e
parentce9f6384362c42717ba77fd693ca1fe745b754e0
parent8db8dc69dc10d667dd83ea9541bcc9e30f321863
Merge branch 'hotfix/1.0.27'