Merge pull request #364 from svost/c++11 origin/c++11
authorCryptoManiac <CryptoManiac@users.noreply.github.com>
Mon, 30 Jan 2017 20:01:04 +0000 (23:01 +0300)
committerGitHub <noreply@github.com>
Mon, 30 Jan 2017 20:01:04 +0000 (23:01 +0300)
Minor updates to c++11 branch


Trivial merge