Merge "Bug 475584 - Problem in order of fragment dependances" into 0.5-maintenance