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