master-bc-780

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