#06.04.14 (ubuntu)
#08.04.14 (ubuntu)
Merge remote-tracking branch 'origin/v1.5' into develop