master-bc-705

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