master-bc-713

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