master-bc-773

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