Commit 1216684d0b7047ec2fdee2175fda41ddce5ed1f1

Zoltan Szabadka 2015-09-23T12:26:07

Merge remote-tracking branch 'upstream/master'