master-bc-781

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