Properly fire off onComplete after upload
Merge branch 'dev'