Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 03:50:47 PDT 2014