Merging current master and forwarding
Authored by: Vladimir Vesely 2015-01-24
Parent(s): [fcd682]
Child(ren): [32f9af]