Sync'd branch integration/inbound with upstream @ Mon Nov 10 20:03:59 PST 2014