fixed typo
Merge branch 'master' into inline-image-option