Pull in latest changes from upstream

This is only an update I made for asset_paths (errbit/errbit#641)