regenerated under Kepler
Merge remote-tracking branch 'origin/develop' into develop
removed a debug message (commented out)