Bug 1016476 - Part 1: Bundle support. r=mt
Bug 1016476 - Part 2: Test work. r=drno
Bug 1016476: more bundle tests r=bwc