From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 24 Oct 2016 15:21:21 +0000 (-0400)
Subject: Merge branch 'release/1.2.0'
X-Git-Tag: v1.2.0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=58769c8fc62e685fcc7b54de4eba8c3ef6f1dd47;p=web%2FTroutCreek.git

Merge branch 'release/1.2.0'
---

a3733ecdf76026855c26c8ffe5b66f0a7413a5fe