grizzly/stable as of 10/9/2013 +  unmerged patches