Do not begin new features in master branch. This reverts commit a00490e86c.
a00490e86c
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>