Sync'd branch integration/inbound with upstream @ Wed Nov 12 06:55:56 PST 2014