Merge commit 'remotes/fml/v0.3' into v0.3