Sync'd branch releases/beta with upstream @ Mon Sep 15 07:08:32 PDT 2014