Merge branch 'develop' of cvs2:WP-Themes/staffords into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Dec 2015 16:57:50 +0000 (11:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Dec 2015 16:57:50 +0000 (11:57 -0500)

Trivial merge