131106
Merge branch '131101' of https://github.com/binensky/Dijkstra into 131101