Recut branch for Luke from new branch which was merged with trunk on 2012-06-19. Rename old branch for (temporary) reference. (part 1)