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