fixed default_conn error
Merge branch 'next' into sam_gcc44_fixes