master-bc-671

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