Merge remote branch 'mikeperry/bwweight-smartlistfix'