Sync'd branch releases/beta with upstream @ Sat Oct 18 01:33:35 PDT 2014