Merge pull request #1817 from jeffbolznv/demote