master-bc-289

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