master-bc-529

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