From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 May 2016 12:43:38 +0000 (-0400)
Subject: Merge branch 'release/1.5.0'
X-Git-Tag: v1.5.0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a99ce35c58a8292e56e97e0f5e65cdeff6e32257;p=web%2FKeweenaw.git

Merge branch 'release/1.5.0'
---

4d9514ff126c44e5389921c17e85896f0896de59