master-bc-742

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