Added compatibility with >=2.1 until branches are not configured properly
Merge branch 'master' into 2.3