Merge pull request #214 from Maatwebsite/1.2

1.2