possible support for 8192
Merge remote-tracking branch 'origin/master' into gh-pages