Sync'd branch releases/beta with upstream @ Wed Sep 17 08:12:32 PDT 2014