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