Merge commit '67cb864ab2' into em_review
Merge remote-tracking branch 'origin/em_review' into sprout_events