moztw/central — pull request #70 by petercpg (2013-04-16 10:36:45+00:00)
Title: Merge master to production

Changes to be committed: