More tweaks for pyramid support.
More tweaks for pyramid support.

mokshaproject/moksha,mokshaproject/moksha,pombredanne/moksha,mokshaproject/moksha,pombredanne/moksha,pombredanne/moksha,pombredanne/moksha,mokshaproject/moksha