Sync'd branch releases/beta with upstream @ Fri Sep 26 09:59:23 PDT 2014