master-bc-623

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