Merged bug fixes and updates from v1.0.x branch
Authored by: artyom-beilis 2014-10-21
Parent: [r2271]
Child: [r2273]