master-bc-536

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