changes-to…ee38ea5b4dddc5628edf612…

May 24 2016

Merge branch 'master' into release
74a41d6f0ef2
·richart on Jan 13 2016, 17:38.

setup version for the release 2.2
1a2d9c66bba6
·tag: v2.2
·richart on Oct 19 2014, 12:34.