Prevent inadvertant mixed-content.
Merge pull request #159 from mikewest/mixed

Prevent inadvertent mixed-content.