master-bc-676

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