ff (+2 squashed commit)

Squashed commit:

[28902cc] dd

[67f9633] asd
Merge remote-tracking branch 'origin/master'