Standardize return - important for callbacks.
Merge branch 'upstream/master'