Merge 'remotes/trunk'
commit53e6c84163462c218dc59bc0d48af18d1fcd5ed4
authorna-Itms <na.itms76@gmail.com>
Sun, 21 May 2017 03:00:52 +0000 (21 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Sun, 21 May 2017 03:00:52 +0000 (21 05:00 +0200)
tree84105753758b31928e422e457ebc29b9ed3c39d3
parentb91e22d9e56194b3f2786ff9cbdda9006910d725
parentfd9f209d0ba9f0a2c8ba7ad215c949a125ad73ff
Merge 'remotes/trunk'