Merge branch 'develop' of cvs2:WP-Themes/troutcreek into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 18 Jul 2017 16:11:33 +0000 (12:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 18 Jul 2017 16:11:33 +0000 (12:11 -0400)

Trivial merge