master-bc-427

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