master-bc-714

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