JedWatson/keystone — pull request #545 by JohnnyEstilles (2014-08-16 06:14:05+00:00)
Title: reapplying fix to #499, rolled back by #530

Nothing new. Same as PR #499.