Merge pull request #789 from maxolasersquad/master