master-bc-527

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