Merge remote-tracking branch 'origin/master'
Authored by: Johannes Binder 2014-08-07
Parent(s): [3237a7][ef6fdc]
Child(ren): [5c1ee4]