Making the emitter backwards compatible

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>
Auto-merge remote-tracking branch 'upstream/master'