Sync'd branch integration/inbound with upstream @ Wed Nov  5 01:05:40 PST 2014