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