Sync'd branch integration/inbound with upstream @ Wed Nov  5 00:20:38 PST 2014