Merge zanata-spa 0.0.4