535d341 rebase to new upstream release 6.9

Authored and Committed by jjelen 8 years ago
    rebase to new upstream release 6.9
    
        
file modified
+24 -24
file modified
+462 -532
file modified
+45 -45
file modified
+529 -529
file modified
+0 -22
file modified
+159 -166
file modified
+1 -1
file modified
+5 -8