master-bc-768

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