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