Merged #103 "flotr2 throws exception on small dashboards"
Merge release 1.6.0
Reset build identifiers for next point release cycle
Merge non-fast-forward for release branch merges
Fix WAR web.xml generation regression
Merge branch 'fix-mxwebxml'