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