Updated moment and strophe
Merge branch 'master' into calref