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