Sync'd branch integration/inbound with upstream @ Sat Nov  8 11:07:55 PST 2014