master-bc-673

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