Change define to interpret ":inline nil" as "make this a $notinline function"
Merge remote-tracking branch 'remotes/origin/master'