type o fix

Signed-off-by: Chris <cdesch@gmail.com>
Merge branch 'refs/heads/master' into gh-pages