Sync'd branch integration/inbound with upstream @ Wed Nov 12 17:52:01 PST 2014