Debugging and fixing the robustness bug
Mac OS X specific robustness bug
Last changes
Merge remote-tracking branch 'remotes/origin/master'