Commit 4edd1a036b3f181f871ab1fb57b01dcd5df67bac

Alan Rogers 2014-07-10T19:17:34

Merge remote-tracking branch 'origin/development' into fix-git-status-list-new-unreadable-folder