Sync'd branch integration/inbound with upstream @ Wed Nov  5 16:31:44 PST 2014