From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 8 Aug 2014 15:49:31 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.5'
X-Git-Tag: v1.1.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=187c7eb3d61a81542476d01fde174133efb53c28;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.5'
---

187c7eb3d61a81542476d01fde174133efb53c28