docker/docker — pull request #7452 by shykes (2014-08-06 22:58:19+00:00)
Title: Cleanup: combine image + events refactor

This is #7370 rebased on top of #7427, ready for review.