code merged into trunk and untrack images