SPY-287 Merging Apache 0.8.2 changes 

Should be all bug-fixes