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