master-bc-849

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