Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 01:20:47 PDT 2014