master-bc-539

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