master-bc-594

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