Fixed fix_layout post_unpack hook
Merge branch 'master' into extended-autoload