master-bc-547

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