Merge remote-tracking branches 'crybaby/master', 'gibson/master' and 'mdwdev/master'