Sync'd branch integration/inbound with upstream @ Fri Nov  7 01:01:39 PST 2014