Sync'd branch integration/inbound with upstream @ Wed Nov  5 22:43:43 PST 2014