Sync'd branch releases/beta with upstream @ Sun Oct 19 17:59:46 PDT 2014