Merging trunk to boomsb:master