master-bc-756

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