Sync'd branch integration/inbound with upstream @ Wed Nov 12 15:27:00 PST 2014