Merge remote-tracking branch 'upstream/master'
authorPavel Pisklakov <pavelpisklakov@Pavels-MacBook-Pro.local>
Sun, 1 Dec 2013 02:41:23 +0000 (08:41 +0600)
committerPavel Pisklakov <pavelpisklakov@Pavels-MacBook-Pro.local>
Sun, 1 Dec 2013 02:41:23 +0000 (08:41 +0600)
Upgrade fork from original.


Trivial merge