Merge tag 'v1.0.18' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 20 Dec 2016 19:47:30 +0000 (14:47 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 20 Dec 2016 19:47:30 +0000 (14:47 -0500)
Hotfix 1.0.18

Conflicts:
functions.php


Trivial merge