Updated to latest upstream HG: 36da3cb92193, GIT: f3315833afbd2e09bcb51d287acd1dafc01e32df