master-bc-516

http://issues.liferay.com/browse/LIFERAYQA-2781