Fix bug where bin counts were not updated when restrict is on and number
of bins is changed.
Merge branch 'master' into gh-pages
grunt