Commit 77b530135b7d55ba4b9cc09cca4647639a13d79d

Zoltan Szabadka 2015-10-07T10:09:07

Merge remote-tracking branch 'upstream/master'