Sync'd branch integration/inbound with upstream @ Mon Nov 10 14:43:11 PST 2014