Sync'd branch integration/inbound with upstream @ Wed Nov 12 12:35:56 PST 2014