master-bc-487

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