Peter Etelej credits shout out
Merge remote-tracking branch 'upstream/master'