[FIX] replace a few more references to trunk with master