Merge branch 'feature/Canonical' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 14 Oct 2015 20:14:52 +0000 (16:14 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 14 Oct 2015 20:14:52 +0000 (16:14 -0400)

Trivial merge