master-bc-762

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