master-bc-578

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