Merge commit 'crybaby/master'; commit 'ponder/master'