geoadmin/mf-geoadmin3 — pull request #1411 by gjn (2014-05-09 12:47:48+00:00)
Title: Adding 2 quick fixes from master

Adding #1410 and #1408 to emergency branch.