Merge branch 'hotfix/2.1.8' v2.1.8
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 20 Jun 2016 16:36:06 +0000 (12:36 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 20 Jun 2016 16:36:06 +0000 (12:36 -0400)
commit1073eb308755c2507d86ab2626e8671ddf4c2ab3
tree71ca78bfdbdd2aaab54c295acd9996d319f026e9
parent37f88b296262ef00162c72fe5af9872678168014
parent56822af37887807c64091ed63018e0c0e1e11785
Merge branch 'hotfix/2.1.8'