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