Merge branch 'master' into newmaster
Authored by: Vladimir Vesely 2015-02-02
Parent(s): [2542d4][d3da5b]
Child(ren): [7b7eaf]