Merge remote-tracking branch 'origin/master' into newmaster
Authored by: Marcel Marek 2015-02-02
Parent(s): [1b34c7][d19ba9]
Child(ren): [6f3dd7]