Updated develop bug fix as per 18sep14 and default-domain fix.