15072014-1100
Merge branch 'devel'