Merge branch 'hotfix/1.0.20' v1.0.20
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:27:35 +0000 (15:27 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:27:35 +0000 (15:27 -0500)
commit4714e34ce96e099a55278bdb3c4791123bdf33f7
tree791e92c6d2ba76c46484fdd0a36c46583ec62c8e
parentf99b9c620a29ed941661355df6148634bc6798dc
parent4efe2013ee5ba7f952a906606735bab3d7224735
Merge branch 'hotfix/1.0.20'