master-bc-426

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