Upstream octropress change