15072014-1527
Merge branch 'devel'