Provisions for strict mode
Provisions for strict mode, fixed license deletion bug
Cleanup
Merge remote-tracking branch 'origin/bugs/160' into develop
More cleanup
Merge remote-tracking branch 'origin/develop'