Matrix: Fix GCC compile issue
Merge branch 'matrix-simd' into develop