Sync'd branch releases/beta with upstream @ Tue Sep 16 02:40:32 PDT 2014