Merge branch 'feature/ForMainUpdates' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 16 Feb 2016 15:30:09 +0000 (10:30 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 16 Feb 2016 15:30:09 +0000 (10:30 -0500)

Trivial merge