Sync'd branch releases/beta with upstream @ Mon Sep 22 14:30:33 PDT 2014