Sync'd branch releases/beta with upstream @ Fri Sep 19 14:56:36 PDT 2014