Building for R15B03-1.  Oliver
Merging build support to bugfix.  Oliver