Merge branch 'master' into 'fix_import_lib_nosql_part3'

# Conflicts:
#   wf/models/state.py
#   wf/models/transition.py