Sync'd branch integration/inbound with upstream @ Fri Nov  7 04:50:50 PST 2014