Merge branch '1.12.x' for second maintainece release

Change-Id: Ic4381e7c43513e058399fe77b38a3572839d4718
tree: afd6350f9ac2894afb89d4dc05fbc835064229ef
  1. data/
  2. features/
  3. plugins/
  4. tests/
  5. .gitignore
  6. .gitreview