Replace 'inline' with 'static inline'
Merge branch 'master' into dev