master-bc-291

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