Merge branch 'master' into development
commit85365c0a22799620ecb090bd9e9257cac17237a7
authorKonstantin Sharlaimov <konstantin.sharlaimov@gmail.com>
Sat, 31 Dec 2016 01:54:27 +0000 (31 11:54 +1000)
committerGitHub <noreply@github.com>
Sat, 31 Dec 2016 01:54:27 +0000 (31 11:54 +1000)
tree020a0d25c2c71f1aa90b59750a8119785da8567f
parentb37306db2fd5cd43e8ef113def9e6a80003680e0
parent433da832530f9c34eb5143aff5a0931deaae71f2
Merge branch 'master' into development