Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 04:47:40 PDT 2014