Sync'd branch integration/inbound with upstream @ Tue Nov 11 19:06:59 PST 2014