Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix Eclipse project generation

Change-Id: I34251f09c8c17a71c307e6118d990fb45e048295