Merge pull request #615 from smfreegard/master

Fix travis failure from undefined var