Sync'd branch integration/inbound with upstream @ Fri Nov  7 08:12:57 PST 2014