Merge remote-tracking branch 'origin/production' into production
authorJan Szejko <janek37@gmail.com>
Mon, 28 Nov 2016 16:37:49 +0000 (17:37 +0100)
committerJan Szejko <janek37@gmail.com>
Mon, 28 Nov 2016 16:37:49 +0000 (17:37 +0100)

Trivial merge