ijiraq/MOP — pull request #219 by drusk (2013-08-23 19:58:26+00:00)
Title: Merge track

Merging the track branch back into master.