master-bc-736

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