Sync'd branch integration/inbound with upstream @ Mon Nov 10 19:56:56 PST 2014