master-bc-545

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