Sync'd branch releases/beta with upstream @ Mon Sep 22 10:27:34 PDT 2014