Merge remote-tracking branch 'rathboma/master' into di