Restaurant 1.0-b2
Latest hotfix added on: Wed Aug 13 05:55:25 PDT 2014
Merge branch 'refs/heads/master' into 2.2.x-legacy