Sync'd branch releases/beta with upstream @ Fri Aug 29 00:40:39 PDT 2014