master-bc-719

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