8 2 stable ce to ee

username-removed-444 requested to merge 8-2-stable-ce-to-ee into 8-2-stable-ee Nov 20, 2015