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