Sync'd branch integration/inbound with upstream @ Thu Nov 13 03:05:58 PST 2014