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