Sync'd branch integration/inbound with upstream @ Fri Nov  7 11:15:49 PST 2014