Sync'd branch integration/inbound with upstream @ Wed Nov 12 11:44:57 PST 2014