Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 14:58:41 PDT 2014