2013-03-15: epl added
Merge branch 'kreincke' into integration
Merge branch 'integration'