Merge branch 'develop' of cvs2:WP-Themes/troutcreek into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Jul 2017 18:40:04 +0000 (14:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Jul 2017 18:40:04 +0000 (14:40 -0400)

Trivial merge