master-bc-690

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