master-bc-512

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