Sync'd branch releases/beta with upstream @ Wed Sep 17 14:09:34 PDT 2014