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