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