Remove call to Page#path before parent has been assigned
Fix asset tests for latest sprockets (sigh)
Merge in spontaneous upstream