Merge branch 'release_2013_04_18'
Merge branch 'development' into feature_f