merge from strongloop