Merge remote-tracking branch 'origin/master'
Authored by: un ma 2014-12-20
Parent(s): [0553f7][4f51ad]
Child(ren): [889ea1]