added by master
added by fred
Merge branch 'fred_master'