b1
b2
b3
Merge batched pull request #26 from barosl/b3

b3

Reviewed-by: barosl
Merge batched pull request #24 from barosl/b1

b1

Reviewed-by: barosl
Merge batched pull request #25 from barosl/b2

b2

Reviewed-by: barosl
b4
b5
b6
Merge batched pull request #32 from barosl/b6

b6

Reviewed-by: barosl
Merge batched pull request #30 from barosl/b4

b4

Reviewed-by: barosl
Merge batched pull request #31 from barosl/b5

b5

Reviewed-by: barosl