Added by Stavros Sachtouris almost 11 years ago
Merge branch 'feature-improve-wait-behavior' into develop