Merge branch 'hotfix/2.0.6' v2.0.6
authorlaury <laury@gaslightmedia.com>
Mon, 6 Jun 2016 20:28:34 +0000 (16:28 -0400)
committerlaury <laury@gaslightmedia.com>
Mon, 6 Jun 2016 20:28:34 +0000 (16:28 -0400)
commit04a9a8f8aae034ff6ddc65b7843d744eb7050f8e
treecc7b1e32cf4e40d2530f1293c6773b4f1264cebd
parent3f0fe06a14a4fccadeac88496c1ddfb9d288ae94
parenta33f341a33768c0b41100727539e3f805cfb092c
Merge branch 'hotfix/2.0.6'