Merge branch 'mkoller/contrib' into dev

Change-Id: I7bfc25a117347bf33edcb95567a1eec8e24b63bb