Merge branch 'stock' into francosound