Sync'd branch integration/inbound with upstream @ Sun Nov  2 04:05:34 PST 2014