master-bc-285

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