B1 merged into master by single file approach

21/10/12 3:32 PM