Fixed stack/5373bbb3ddf24708f8db3790
Squashed stack/52cc85a37841550bc4b8c9a6
Maybe helped with stack/52b3c1847841550ad40d85f7
Fixed #1295