Merge pull request #2193 from rosysong/freespace