Merge branch 'smsc-energy-detect'