Sync'd branch integration/inbound with upstream @ Fri Nov  7 17:56:48 PST 2014