Merge remote-tracking branch 'origin/YaSp' 53/16953/1
Antoine ELIAS [Mon, 3 Aug 2015 13:13:53 +0000 (15:13 +0200)]
Conflicts:
scilab/CHANGES_5.6.X

Change-Id: Id915fe8b5050104c1ddb9c21247da7f5d91cd5e1


Trivial merge