Commit bf0107d1ece702d67e13f4e7e5063fbcabf6c040

Vicent Martí 2012-02-01T17:35:11

Merge remote-tracking branch 'arrbee/status-bugs' into development