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