Working on bringing codebase up to moment/moment#develop.