Homestyx hydra

R1:5c0333cef9de

Make Celerity merger Windows compatible
Repository: R1 hydra
Commit Date: Apr 23 2013