Sync'd branch integration/inbound with upstream @ Mon Nov 10 18:02:00 PST 2014