calololback

(how the hell was this working?)
Merge remote-tracking branch 'origin/0.5.1' into cluster