Bump.
Added latest SmartOS
Merge branch 'test' into dev