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