Sync'd branch integration/inbound with upstream @ Mon Nov 10 07:45:05 PST 2014