Sync'd branch releases/beta with upstream @ Wed Sep 10 13:33:28 PDT 2014