Card #247
https://trello.com/c/V40gfUaI
Merge remote-tracking branch 'origin/master'