updated security releases
Merge branch '2.0' into 2.1

* 2.0:
  updated security releases
Merge branch '2.1'

* 2.1:
  updated security releases