Merge branch 'apache-tour-de-flex-1.2'