Merge remote-tracking branch 'origin/master'
Authored by: Johannes Binder 2014-05-30
Parent(s): [32b232][f56cab]
Child(ren): [3b976a]