Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:34:08 +0000 (16:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:34:08 +0000 (16:34 -0400)
commita744f957ce308b8255f90fe8d239a6406077e07a
treee90c6161852cdfd0dd6a87ddf3b41223f4296ed6
parentecf1892c8b08344b11726b951e8059e6112d2026
parentadd9cce1201b5028198dde57e359beac6062ca5b
Merge branch 'hotfix/1.0.14'