Sync'd branch releases/aurora with upstream @ Fri Sep 12 08:11:33 PDT 2014