Sync'd branch releases/aurora with upstream @ Fri Sep 26 10:18:36 PDT 2014