Sync'd branch integration/inbound with upstream @ Mon Nov  3 01:40:48 PST 2014