master-bc-718

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