BIRN 3.0.0 Update
Merge branch '2.1-Update'