Gh 815

@bendk - ran selenium tests on the gh-815 branch on staging and no seeing the error anymore.  We should merge this one.