master-bc-281

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