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