2014-05-05: fixed the stamp045-event-defintion-fault
Merge branch 'kreincke' into integration