seankross Merge pull request #781 from swirldev/dev