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