automatic update
Merge branch 'master' of https://github.com/thetrickster/jagel-dev
updating