Sync'd branch integration/inbound with upstream @ Fri Nov  7 07:41:43 PST 2014