Merge pull request #2154 from BrennanConroy/bug_30018