Sync'd branch integration/inbound with upstream @ Wed Nov 12 15:05:57 PST 2014