Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 05:15:05 PDT 2014