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