Merge pull request #1 from octobercms/master

Update