do not be confused by -broken symlinks
Merge branch 'master' into gb_master