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