Merge branch 'develop' of cvs2:WP-Themes/mackinawferry into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 May 2017 17:56:56 +0000 (13:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 May 2017 17:56:56 +0000 (13:56 -0400)

Trivial merge