Fix Build Image
Merge Upstream @ 08/07/2013 08:17:02 PM