Merge remote-tracking branch 'origin/master'
Authored by: Johannes Binder 2014-09-08
Parent(s): [4c6559][b05a60]
Child(ren): [078bf7]