Merge branch 'origin/dev_1.5'
Authored by: viras 2014-01-20
Parents: [046c89][557ae0]
Child: [00c8da]