Merge branch 'master' of http://github.com/gaiius/ci
Merge branch 'master' of http://github.com/gaiius/ci