[Fix Bug 748503] Rewrite for Nightly Redesign
Merge pull request #890 from Sancus/master